added menu stuff from miquel and sunny