Cleanup
Debug window + UI improvements