Change main.html flow
Minor UX tweaks and changes