change comment and layouts