Fixed a bug when routing requests; Made minor layout changes
Fixed a bug when routing requests; Made minor layout changes