Few UI changes, and more messy code.