Add comments load & fix style