Some small changes to UI