Added Tooltips and continued to add db storage