Moved media queries to dedicated stylehseet and updated template files.