Make the Source control a combo box and move things around a bit