Clean up controllers & better loop in welcome view