Make OCModeLayout independent