Merge "More minor menu changes" into sc-dev