Remake the unsatisfied alignment and shape

,