more polish, new buttons and clean modals