Working through issues

Removed play button, made some minor changes to clean up a bit.