changes suggested on first feedback, also adding music player