Fixes settings button and some action button things
Merge pull request #1 from kyleh415/features/settings_button

Fixes settings button and some action button things