working on front-end
css
half-working scrollbars. better menu buttons
fixed merge