Added some thigns to the theme & the defering stuff for the view model