Minor changes in Application switch