fixing loading animations and controls