Upted UI anUpdated UI and templates