group toggle box fixes
refactor stuff, layout improvement