More work on navigation bar