replaced own print hiding
refactor
cleanup
new button layout in UI