Added tooltips and fixed some design issues