Added loading indicators and fixed rare bug with rotation