changed the UI + buttons layout