Major refactoring
Hack patching home page modals