Media Section fixes