Latest trainer ui changes
Merge pull request #46 from dmilisav/master

Latest trainer UI changes.