Updating layout to use more flexible selectors and rules.