More code cleanup. Added images to resources.