some refacto in routes and ui