Add Favourites widget + CleanUp code