Added routing and some more UI