step 1.7 - global layout controller refactor