Modified appearance of modal popup, moved template to external file