Moved pubsub from global scope, screen switching, dialog text