clean up
added navigation structur