Added separate navbar and cleaned up formatting