Cleanup and some media queries