Form Validation and menu refactored