Miguel: changed layout (main and comments)