Updated size, display to use WD390
Added missing check for null song