Remove welcome controller, improve forms