Display and persistence improvements
Lots of changes