updated layout -- still some bug