Added fluid removal ability, updated main form to display icons if they have been assigned.