Fix the pictures upload and display bugs