Made some changes to make UI flow better