merged, fixed syntax error, removed legacy play button (again?)