Clean up and crash fix
Enable new gui through secret flag