final UI polish
fixed merge conflict in autotrainer