Revert d06ebe1..115d1cf

This rolls back to commit d06ebe19f4183e94e1cfa0dc94d62fe16ecc3396.
Revert 115d1cf..30312dc

This rolls back to commit 115d1cf2fa8eed1ba007386c7bbf251efd801320.
Fixed Play- / Stop- Button Bug