Trying to fix alignment issues