Final version of 3.0 controls

Signed-off-by: Matt White <matthew.white@fclonline.com>