Various UI changes and hopefully one controller fix.