Fixed the routing issues and unified the matrix listing view for greater reuse
Fixed the routing issues and unified the matrix listing view for greater reuse