Minor TopMenuPanel changes