Half way done fixing styles