layout tweaks to allow more fine-grained overrides