PR for code review

I've written most of it on strings.xml and dimens.xml po.