Fixing the comment form buttion and add hover highlith
merge conflits