MOBILE-168 Improving layout in tablets