Added Play Now! action and some refactoring.