Re-engineer landscape mode