Menu updates, minor fixes