Added modals, fixed up ui