Added menu logic