Flat view improvements