Fixed some layout issues when using iOS 6