Fixing conflict issues with site

Old html code was merged into new.. removed old code