Added Train UI
Merge origin/master