Add music page and refactor a bit