Persist database
UI fixes