Working on #756 Remove Hardcoded HTML
Put code in wrong place >_<