more layout changes and tooltips