Bug fixed + MVVM completed