Layout fix issues for Tablet