Music part of app - Phase 3 + loading spinner and cleaned up references