actually use the angular based site selector, some more improvements, bugfixes