A couple ore tweaks to the tools layout