Refactored navigation drawer items into an enum.  Misc clean up