Restructure and continue UI work.