Fixed routing, added some style