Animation and general improvement