Updated popup starter files, renamed and fixed some things