separated into partials and changed title