moved some buttons around for a better UX