Fix up some small things and set up the layout for the next stage of design