A LOT of minor UI changes and tweaks