initial layout change with svetla's changes