-Final fixes post-patch

-Fixed UI sync bug