Refactored apartment view, now ordered by complex name