Fix homepage view model
Minor changes