Move styles to CSS file & Correct naming mistakes