Some cleanupt wor on implementing use of shared layouts.