cleaned up views - fixed merge