Work on optimization framework, media queries