Started work on modals
Update to modals and adding focus mode
Merge branch 'feature/focusMode' into develop