updated

updated
clear, optimization updated /layout