Rebase this: trying to make it draggable
Get rid of role listitems. Missing closing tag, extra closing tag cleaned up