formatted info window
fixed conflicts after merge