Layout touchup
Resource cleanup