Updated res/layout & res/strings