Fix view menu and cleanup old expand home options