Reworked music and videos sections and other improvements