Merge pull request #1 from mp3music/master

pulll
Merge pull request #2 from mp3music/master

Update from original
- main page and search page
Merge pull request #8 from ARACOOOL/master

main page and search page