#121: more layout changes
#121: use resolve in RouteProvider to get query and instantiate controller when resolved