Move around templatetags and badges to have nicer names