added menu bar
added menu bar
working on one page scroll
ui changes
fixed conflicts