improved routing, menu and layouts. not all done yet.