Make use of SimpleAnimatorListener (and random layout formatting change)