Optimized tablet pa layout

Change-Id: I1d103f7725d2ef8353e0355e6304bd3657617dfa