fixed layout error, and apply feedback.