Refactoring
views refactoring
button text updates
More refactoring, some dialog niceness