Added fallback for eID
UI: Added UI updates