Added menu and more logic