Finished navigation bar plus code cleanup