Tweaks to grouping, gotta fix the load menu though.