added Buttons + changed StartActivity to Settings
Merge remote-tracking branch 'origin/master'