Added modal windows and data population