More work on Two-Up view.