Optimize validation and replace sort indicator
Merge branch 'secondDemo' of https://github.com/nromanen/Ch-024 into secondDemo
fix template