Added modal windows

Still need some tweaking