Added choice controller, edited welcome#index