Fixes in History, Setup & Home screens