modified positioning with css + html, modified menu
fixed merge