UI updates and code clean up.