fix doubled html-section in media choose (#150)
Also a cleanup of media_choose.tpl