Alot of work
Removed dead html