is now a hub page, links to other pages, added circlerect
fixed conflicts