added uinavbar to main page and settings page
added information buttons to settings
deleted conflicted file
Merge pull request #26 from OwenMcGirr/iss#24

settings page clean up and added navigation bars