Adding some more styling etc