Fixing validation issues.
Fixing tab v space