Finalising most of the stage one functionality and a bit of styles