[#3] Greg, Charles and DJ - refacors the popup creation