UI updates. Some code updates