More refactoring / linting, added missing modals and made title bar change