Revert c7df97b..ab315f0

This rolls back to commit c7df97be4caeffcd1b949e94ed64cfcbb2355052.
Improved the button layout

[Done]
 - improved button layout
[ToDo]
 - Some rest