MOBILE-401 Fixing tabs / spaces