Some fixes on HTML layout