Added UI updates!