Added modal popups and some styling