Bugfix html content, optimized page layout