Improve list/grid/button selector madness (reduce view hierarchy!)