Brett - Re-organized code; added media query