Working on improving music app