Integrated and correctly functioning media queries.
Added borders and cleaned up some media queries.