Roll back Xcode 4 variant of the Storyboard
Simplify code
Ensure Edit mode is disabled when we disappear
Fixes an issue with 64 bit