Rearrange some views of account module