User flow changes

fixes #181