Issue #4 - Updates to add validations and cleaner form layouts.