remake layout
remake layout for tablet

merging layout for portrait and landscape in tablet, just adjusting the
weight