Minor modification on view hierarchy to support iOS 7