Fixes to media rendering
Media API now working fully