Restructure html for gifts new view