layout and animations updated