Refactoring back to dedicated layout