Play button/cursor added, code logic rearranged