Minor changes, planning to implement new image upload