updated layout #349