profile image url fixed temporary
toolbar templated conflict merged