#40 Menu changes