Fixed two Bugs & Updated from latest jedreza

I've synced with the latest from jedreza and fixed two bugs with the display of groups (commit a15c00166f41ee6ff29f899ced98bb9d060dccd5). 

No other changes.