and more UI Updates