Improve landing flow

Card: https://trello.com/c/ETM80VG7/14-improve-landing-flow