Added some fixes and loaded actual media resources