Added functionality to the Generator Screen