Minor changes in the look and feel