added menu view
conflict fixed