UI and Shen Updates