changed training rendering order
refactored code, added related