add media support; layout fixes