Refactored advancement menu