change layout to make develop more easy