fixing a number of visual issues