Created watch_layout view with volume control and play/stop buttons
Resolved conflicts