add media screen clean up
add media screen fixes