Added page styling and some refactoring