Pre-Beta : Custom info window

Missed the commits to custom info window in last request.