Improved html structure a bit