Added tooltip, more actions, saving, and code cleanup