Some functions and minor UI updates