improvements based on feedback

Conflicts:

	res/values/04-network.xml