Fix layout for WiGenre page
Merge master