Added song titles.
Some design restructering.