some more UI cleanup
initial router implementation