HelpDesk: UI changes, removed redundant/unused code, improved error control