Added user tracking, combined welcome_ and non-welcome_ views