added tooltips with help
  optimized layout