Pages restructured, new functions, modals improved, and some other fixes