Improve device select view