resolved merge conflict, added navigation and styling