fixed a few bugs      changed menu