Finalized UI updates