User Experience updates in Trainer