Add some extra floatright rules
Tweak media rules