More scenes refactoring.
More refactoring.
Updated iOS mapvies.