Fix for performance issues and for the disappearing login control for the upload tool.