Fixing media url paths
Few cleanups