Improved the logic and feedback system of displaying guidelines
Merge remote-tracking branch 'training-git/master'