Refactored common menu things