Adding validation and titles