Better isActive() and better menu