Added loading icon and improved html