Fixes Few Form UX;


Signed-off-by: ashwinh <ashwinh@cybage.com>