Improved formatting on 2.3 media component