Added backbone association, fixed rendering issue