Cleaned up UI Navigation Drawer Code.  Issue #1838