Made all changes to html generating function return values