more tweaks for layout, and start hacking on menus