Added support for iOS7 style previous/next buttons, Change class structure