Switch back to imgstore-a
Cleanup + updated tooltips