More UI improvements. Now with animation.