Better routing
Update readme
Better layout