Move to instancetype for constructors
Updated keyboard for iOS7