UI update and tweeks.