Refactoring in city demo
Updated display region handling in city demo