Everything done till MVVM functionality
Content updated