Code clear

* Added braces
* Remove php close tag on end of page
* Replace <?php echo to <?=