Refactor, micro improvements on generators..
Dialog box functionality.
Dialog box code preparation.
Small refactoring.