Added routing, a little bit styling and things...
fixed merged conflict