Update layout and minor updates to tools