Refactored js
Fixed layout
Merge branch 'create-mymusic-design' into develop-design
Used new styles