Added transitions, error dialogs, other things