added tooltips and layout