Small clean up
remove replace yo generated html with draft layout html;
user name generation;