Changing view
Improving validation