Added menu and some improvenments