Swap display logic in manage view, add integration tests