Feature/new ui tools

Pull request for the new features in new ui-tools.