Switch to using transition for the main page and other minor tweaks