edit comments
layout restuctured