Layout fixes for four tools