Fixed more align issues