clean up
layout modified