More work on the user set view