UI Refactor to fix crash on initial start.