Rehaul of UI, refactor in progress