Nav Refactoring - makePanel and drawPanel for all