Improved html organization