Improve views, working on Champ Select