Lots of changes
Added modals