Small changes in characters view
Pull from master, fix conflict