Remove buttons from home screen and remove busy wait