Big restyling - looks right though now