Added modal windows and new UI