pulled out media elements into their own partial
minor tweakage