Inital commit with menu changes