refactoring due to simpleui changes