fixed rendering to fit model/scope layout

all tests are passing, surprisingly 30% faster