Performance and html structure
Tidied up everything