ADEN-975 Preparation for 71M fluid

With this, we'll be able to switch the layouts with code push only