Additional changes to CSS/HTML for commercial components