Brought in master's CSS fixes
Brought in master's CSS fixes

Will probably cause merge conflicts later... Oh well.

andrewerb/FullScreenMario,daivee/FullScreenMario,bx5974/FullScreenMario,eross/FullScreenMario,chensj1901/FullScreenMario,janson123/FullScreenMario,sushilkumaraitian/FullScreenMario,eross/FullScreenMario,vaikan/FullScreenMario-JSON,rmallols/FullScreenMario,ogregoire/FullScreenMario,andrewerb/FullScreenMario,janson123/FullScreenMario,sushilkumaraitian/FullScreenMario,janson123/FullScreenMario,sushilkumaraitian/FullScreenMario,shuidong/FullScreenMario,shuidong/FullScreenMario,eross/FullScreenMario,bx5974/FullScreenMario,rmallols/FullScreenMario,shuidong/FullScreenMario,vaikan/FullScreenMario-JSON,daivee/FullScreenMario,ajrulez/FullScreenMario-1,rmallols/FullScreenMario,chensj1901/FullScreenMario,daivee/FullScreenMario,vaikan/FullScreenMario-JSON,ogregoire/FullScreenMario,andrewerb/FullScreenMario,ogregoire/FullScreenMario,ajrulez/FullScreenMario-1,chensj1901/FullScreenMario,ajrulez/FullScreenMario-1,bx5974/FullScreenMario