WIP: UX improvements (do not reset time when taking photo from the app)