More layout and manifest fixes. Notably, moving most hardcoded strings to strings.xml