added menu and removed some not needed code

close #1