Menu enablement at startup seems to be largely correct now.