Slight changes to the UI