Clean up CSS and views, implementation of basic animation