Improved align and visual groups.