finish layouts and routes

Signed-off-by: Paul Bonneville <paul.bonneville@me.com>