Merge pull request #210 from kordero/19690

More dialogs moves, more code revamp
Budget management improvements & bug fixes