A whole lot of visual fixes