Update css, clean up code