move comment form and comments-block to widget