changed setting of tags/show for small view
added media queries
pulled from origin master