fix alignment issues