Coupling persistence and external data and ui fixes