userid bug and modal spacing fix