various fixes
better nav in group