More work on navigation menu