Finising touches on generic layout including media types and other header stuff