Update and organize CSS