Validation Fix

Re-included Controller which fixes Validation errors, according to my
piece in Codepen.