Menu presentation improved; other two tabs need working on