Code cleanup #4

Made some small changes to the templates to make required input more clear