more changes to have better cell layout