Improved dependency management. Minor UI changes