Further work on layout - own media