Added beautification part 2
Related routing changes