Refactored UpdateMenu to be more readable and more consistent