Made controls dynamic