Fixed the animation issues but currently having some animation issues due to the new implementtaion of the buttons.