More changes to Nav Panel