added navigation more structure and fixed a few issues