Comment-Layout improved