Changed some things and added popup.class