SPA UI changes