small renaming and refactoring, btn exit added