Add loading animations, cleanup html