refactoring: continue with separation of X and Y in layout