Slightly better ui with buttons