Reverted media query related changes since they were not working correctly