make some changes about layouts