Added menus and curve closing