Fix welcome view logic