Add song functionality, other design changes