Small tweaks
Fix group mouse interaction issues