Refactored App Menu