Add cross link to shhs and minor layout adjustment