* modify layout to match Google Requirement