Code cleanup and MyTask Tab updates