Resource clean-up as well as a few layout changes.