Refactor

Refactored objects and dynamically coded menu