Added Toasty and tooltips and made other small modifications