Rearrange and more stable for mobile

(I think so)