Merging menu changes, still lots to fix