Moved buttons to the top
Merge pull request #427 from jidel/setting_buttons

Moved buttons in the settings view to the top