Added some missing component controls, improved image loading.