MOBILE-210 Trying to fix the layout problems