Crash fix, cleaning up project layout, layout fix for iOS 7