Merges visual fixes