Refactored. Added full information to menu. Prettier