Added loading style and tidy