Implement exit and fix control names