Changes to layouts and string resources