Started Styling, also tidied up a lot of code/markup