Debug + Rearrange menus

Halfway implemented new menu scheme. TBD: revise display rendering for
display states.