added navigation bar, fixed page layout