Little bit of tidying up and start working on the styling for it.