Restructure UI into partials