merged latest changes, and resolved media info page build