badges are now on person show, working out dashboard layouts
fixed merge conflicts