Made a lot of changes, really ended up not doing much to the routing... added twitter bootstrap in the meantime