design: Rearrange menu