resolved merge conflicts that arose on merging with the code base pushed by shailaja.
removed the menubar