small refactor, ui changes, init step refactor
ui