Adding Alex's UI changes. Please use branches from this point on.