Clean up and stubbed out nav