SPA prototype made a little less ugly