Shapes added, working with drop downs and radio buttons