cosmetical changes
fix forms
fixing html type and uuid type