added navigation and merged with old version