Fix animation and indenting bugs