pop up fixed and references to current_user removed