Revert back to view manager design