Refactor minor issues.
Move all text to resources.