Fixed some display stuff.

Unfortuntaely there are a heap of bugs to do with said display
problems. Will facebook you guys about them.