Finished new main navigation