changes to fix alignment issues