fix bug and rearrange heads up