More project-related bugfixes and code refactoring to increase application responsiveness