Improved welcome view and controller