Mapped out user flow & adjusted views accordingly