fixed order and alignment issue