Updated style - now slightly less awful