Changed flow, fixed bugs, added info dialogs