Added PlayViewController and more changes