made inages iewable and cleaned up index table
fixed merge conflicts