Update tools

And remove layout-large