Awesome visual fixes from the awesome @jpsirois