Re-factors User UX/Form;

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