diff --git a/ofu_app/apps/food/models.py b/ofu_app/apps/food/models.py
index 20e2fb0..e4ed81b 100644
--- a/ofu_app/apps/food/models.py
+++ b/ofu_app/apps/food/models.py
@@ -106,10 +106,11 @@ class UserFoodImage(models.Model):
         suf = SimpleUploadedFile(os.path.split(self.image.name)[-1],
                                  temp_handle.read(),
                                  content_type='image/jpg')
+        # TODO: Fix it
         str_food = smart_text(self.food.name, encoding='utf-8')
-        self.thumb.save('%s_%s_thumbnail.%s' % (str_food, self.user.username, 'jpg'), suf, save=False)
+        self.thumb.save('%s_thumbnail.%s' % (self.food.id, 'jpg'), suf, save=False)
         # save the image object
-        self.image.name = "%s_%s_original.%s" % (str_food, self.user.username, 'jpg')
+        self.image.name = "%s_%s_original.%s" % (self.food.id, 'jpg')
         super(UserFoodImage, self).save(force_update, force_insert)
 
     def delete(self, using=None, keep_parents=False):
diff --git a/ofu_app/apps/food/views.py b/ofu_app/apps/food/views.py
index 64f7417..9e6719c 100644
--- a/ofu_app/apps/food/views.py
+++ b/ofu_app/apps/food/views.py
@@ -17,7 +17,7 @@ from apps.food.models import Menu, HappyHour, SingleFood, UserRating, UserFoodIm
 def daily_food(request):
     today = datetime.datetime.now()
     start_week = today - datetime.timedelta(today.weekday())
-    end_week = start_week + datetime.timedelta(20)
+    end_week = start_week + datetime.timedelta(7)
 
     feki_menu = Menu.objects.filter(date__exact=today).filter(location__contains="Feldkirchenstraße").last()
     austr_menu = Menu.objects.filter(date__exact=today).filter(location__contains="Austraße").last()
@@ -135,6 +135,8 @@ def pic_upload(request, id):
     form = UploadImageForm(request.POST, request.FILES)
     if form.is_valid():
         try:
+            food = SingleFood.objects.get(food=id)
+            food.image.clear
             old_user_pic = UserFoodImage.objects.get(user=request.user, food=id)
             old_user_pic.delete()