refactored other views to use mvvmfx