added menu bar fix, need to fix some bugs