Corrected UI and added tooltips