Add rotate control & auto rotate. Structure changes