Added Surname to Registration Module, refactored the main menu a little