Fixed animation and some styling