Minor changes to the look and feel