Minor updates to menu system