Clean up navbar and spacing