US821 - Layout and styling improvements