merge request

making headway on landing page and individual category pages
changed