updated comment form styles
updated comment form styles
fixed merge issues