Improved HTML layout