Minor styles guide stuff.
Fixed some bugs icm with newest media module, 7.x-2.0-unstable7.