Fixed several issues with music app