Improoved selection view