Revert "Changes to strings and layouts"

This reverts commit 371d130000b56dd35063fabbe89a7e54d8cbf4c3.