Move CSS to .css and clean it up