Improvements to adminTools and user tabs scripts