Cleanups and CSS3 animations