tidy code for items controllers
tidy up of settings
refactored oncall items