Fix comment form design and bugfix