change template fix and added * for mandatory fields