Improve desing of data and tools section