Fixed some layout problems for tablet