Page refactor + style updates
...