Added Config Popup, cleaned up some old code