layout updated a little bit