mega-commit: refactoring UI, dealing with consistency issues, troubleshooting and more testing