Added transitions and things
Tweaked colours, fixed bugs