Added toggles and fixed retina/media-query alignment issue