Removal of Play button & 2nd bug resolution