Adds animation and minor layout fix