Second pass at buttons, remade menus