Some code refactoring and added new setup dialog