Tweaks to support get_option driven layout preferences