diff --git a/Helloworld.class.php b/Helloworld.class.php
index 52a98d0..5832a83 100644
--- a/Helloworld.class.php
+++ b/Helloworld.class.php
@@ -276,7 +276,7 @@ public function showPage()
 		$subhead = _('Item List');
 		$content = load_view(__DIR__ . '/views/grid.php');
 
-		if ('form' == $_REQUEST['view']) {
+		if (isset($_REQUEST['view']) && 'form' == $_REQUEST['view']) {
 			$subhead = _('Add Item');
 			$content = load_view(__DIR__ . '/views/form.php');
 			if (isset($_REQUEST['id']) && !empty($_REQUEST['id'])) {
diff --git a/module.xml b/module.xml
index 4c17e8c..a018d93 100644
--- a/module.xml
+++ b/module.xml
@@ -6,7 +6,7 @@
 	<category>Development</category>
 	<Publisher>James Finstrom</Publisher>
 	<info>http://wiki.freepbx.org/pages/viewpage.action?pageId=19498386</info>
-	<licence>GPL</licence>
+	<license>GPL</license>
 	<licenselink>http://www.gnu.org/licenses/gpl-2.0.txt</licenselink>
 	<database>
         	<table name="helloworld">
diff --git a/views/form.php b/views/form.php
index 7635441..d35f52c 100644
--- a/views/form.php
+++ b/views/form.php
@@ -1,5 +1,5 @@
-<form action="" method="post" class="fpbx-submit" id="hwform" name="hwform" data-fpbx-delete="config.php?display=helloworld&action=delete&id=<?php echo $id?>">
-<input type="hidden" name='action' value="<?php echo $id?'edit':'add' ?>">
+<form action="" method="post" class="fpbx-submit" id="hwform" name="hwform" data-fpbx-delete="config.php?display=helloworld&action=delete&id=<?php echo isset($id) ? $id : '' ?>">
+<input type="hidden" name='action' value="<?php echo ( isset($id) && $id ) ? 'edit' : 'add' ?>">
 <!--Subject-->
 <div class="element-container">
 	<div class="row">
@@ -11,7 +11,7 @@
 						<i class="fa fa-question-circle fpbx-help-icon" data-for="subject"></i>
 					</div>
 					<div class="col-md-9">
-						<input type="text" class="form-control" id="subject" name="subject" value="<?php echo $subject?>">
+						<input type="text" class="form-control" id="subject" name="subject" value="<?php echo isset($subject) ? $subject : '' ?>">
 					</div>
 				</div>
 			</div>
@@ -35,8 +35,7 @@
 						<i class="fa fa-question-circle fpbx-help-icon" data-for="body"></i>
 					</div>
 					<div class="col-md-9">
-						<textarea class="form-control" id="body" name="body"><?php echo $body?>
-						</textarea>
+						<textarea class="form-control" id="body" name="body"><?php echo isset($body) ? $body : '' ?></textarea>
 					</div>
 				</div>
 			</div>
@@ -49,4 +48,4 @@
 	</div>
 </div>
 <!--END Body-->
-</form>
\ No newline at end of file
+</form>