step 1.9 - global layout controller refactor