group comp working again, layout fixes