replaced own print hiding
refactor
cleanup
new button layout in UI
explicitly testing layout is bad
Merge pull request #392 from leider/master

Buttons now cleaner
Merge commit '2ca54bddbf97c91942f86559a90c0459ef61934e'
Extracted local variable.