(Refactoring) Layout localisation message titles changes