Finished layout and routes

Change-Id: I1b477df73239f07bbb15e50ec492ec798b2d51e5