Small improvements to the main menu/hs-list