more changes to song model and view