new layout and partials
improve tests
improve tests