added navigation bar, corrected some formatting