UI changes made and pub/sub system enhanced