Refactor default lay-out