Improve admin match navigation