Excess classes and segue freeze fix
CGContext fix