Finish layout and routes(Huge work)