added media query class
Seperated context into separate class
Added context into Media query
merged with existing code