Added overlay and spinner