Better homepage speed and modals