Fixed layout issues and added conditional border to button if it is iOS 7.0 or above.