src cleanup and add play button