Improve/Simplify situation around Default/Full view modes/view displays