New comments branch
More color styling