fixed more alignment issues