Large changes to layout, tree display, added map options