Visual polish fixes 110