Design

Better modals and some button changes. Other minor revisions