Popup window is now dynamically populated
merging in master