Big UI update.
More UI tweaks