Minor UI updates to MSW