A few UI interface fixes; sync