Made sure forms are focusing on correct inputs when showing in 2 diff scenarios