Fix ArrayIndexOutOfBounds exceptions
Add layout for upload progress overlay