Improve code and added play button