Fixed align issues