Refactor names of layouts to make more sense