Put the menu back in, some other minor changes