Redesigned validation [sub.1 on #1]
Merge branch 'redesign_validation' into develop