Commentsui

merged with master