Updated with animations and styles