Minor refactoring and fixing the pushbutton "clickability"