Nested locations are now supported

UI improvements:
	- expand and collapse for nested locations
	- nested locations identifier generation fixed