UI changes so far

Here's another UI branch sync merge!