Changes to Layouts and strings