Reduce number of queries for manage/match
Make admin area prettier