added navigation. cleaner design