Extracted navigation controls to NavPanel class.  Added StaticBox and 
label around them.