Finished first iteration of modal popup