Fix header
Complete edit and update for roles