Minor changes to navigation and formatting
Major Changes to Client and Admin Backend