UI tweaks. Fixed ViewModel activatition issue.