Page refactor ready. Bugfixing now.