Fixing view display selection, cleanup