step 1.8 - global layout controller refactor