Added more logic to nav bubble / main bubble sync