Improve design according to David's spec. Add tooltips