Added Chris' menu changes