Pieters changes: mainly improving the groups view