did some layout cleaning and minor error