Fixed issue with list updating
Removed unused buttons/text; Added tooltips to buttons