Various layout changes to make things fit and to better match the layout shown in the design doc.