[REFACTORING] Update layout: charset definition