More improvements to the look and feel