Refactored the layouts to have more accurate names.