Animations more smooth and added some controllers