Added Ajax loader back as well as small changes