Changed ui route
Merged changes