organized modals and buttons
more changes