Some basic fixes to make stuff lay out properly