fix align issues