Updated Create Site & PopupMap

Made the code nice, clean and pretty