part way through fixing up the styling