initialized fixes
Finish ui-bug-fixing