Fixing up media queries, simplified them further and added a couple of more breakpoints in.