ui changes
ToDo: refactor console