Temp fix for array name generation, also fixes Images tab in GUI