User persistence and more UI