Fixing a few UI bugs and adding error messages.