Converted to ARC + added storyboard logic
Fixes in edit controller + code style