Change from form to button-based UI