Tidy up css and animation