Added lots of dynamic and visual polish