adjust-layout

Make adjustments to the layout, as there are some bugs with the grid and composition.