added media modules, tweaked user module