Enhancements to the code, more validation of inputs
Code cleanup for view, added more classes