Final adjustments to the layout and navigation