iOS 8 Fixes

Location and layout fixes