Refs #21007; Updated layout, cleanup in css