Improved quick and nowplaying with margins