Added the same changes I made to the 1.1 branch, all display-related