Added two new Task Steps + few UI enhancements