Added inline choices
Changed admin template