Added MediaSelectionControl
Removed commented items from master template