some ui and route fixes