Updated for form view controller base