updated styling and logic in preperation for CSS animations.
Merge branch 'ivan'