Just more cleanup

Mainly tweaking the layouts to use strings.xml and such.