yotam: ellie's pull request of layout improvment