Fix/261 home feedback