added static, added media and minor fixes