Started fixing MenuOption
(Was not added to git correctly)
Now rendering most of MenuOption correctly
MenuOption should now be functional and correctly rendered again.
Some code cleanup should be considered