New view select buttons
Merge fix