renamed all userbar templates to be more uniform and changed 'edit bird' to 'userbar' throughout